debian/patches: Use ab style filenames

diff --git a/debian/patches/config-prefix.diff b/debian/patches/config-prefix.diff
index 922b617aa933d2b13d0a099b81f3d200605219c4..03711eec635caeff7cf4bcb150139e0654beeb5a 100644 (file)
--- a/debian/patches/config-prefix.diff
+++ b/debian/patches/config-prefix.diff
@@ -6,8 +6,8 @@ Patch-Name: config-prefix.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/Config.mk
-+++ xen-4.8.2+xsa243/Config.mk
+--- a/Config.mk
++++ b/Config.mk
 @@ -82,7 +82,7 @@ EXTRA_LIB += $(EXTRA_PREFIX)/lib
  endif
  
@@ -17,8 +17,8 @@ Patch-Name: config-prefix.diff
  # The above requires that prefix contains *no spaces*. This variable is here
  # to permit the user to set PYTHON_PREFIX_ARG to '' to workaround this bug:
  #  https://bugs.launchpad.net/ubuntu/+bug/362570
---- xen-4.8.2+xsa243.orig/config/Paths.mk.in
-+++ xen-4.8.2+xsa243/config/Paths.mk.in
+--- a/config/Paths.mk.in
++++ b/config/Paths.mk.in
 @@ -13,6 +13,7 @@
  # http://wiki.xen.org/wiki/Category:Host_Configuration#System_wide_xen_configuration
  

diff --git a/debian/patches/rerun-autogen.sh-stretch.patch b/debian/patches/rerun-autogen.sh-stretch.patch
index 34af69aaf6d4cf38eb62aaf5046bae93f545eca8..19d17330d8040b9e0fca5448bddbfe2eef9ddb21 100644 (file)
--- a/debian/patches/rerun-autogen.sh-stretch.patch
+++ b/debian/patches/rerun-autogen.sh-stretch.patch
@@ -8,8 +8,8 @@ Signed-off-by: Ian Jackson <ian.jackson@citrix.com>
 
 ---
 
---- xen-4.8.2+xsa243.orig/configure
-+++ xen-4.8.2+xsa243/configure
+--- a/configure
++++ b/configure
 @@ -641,6 +641,7 @@ infodir
  docdir
  oldincludedir
@@ -59,8 +59,8 @@ Signed-off-by: Ian Jackson <ian.jackson@citrix.com>
    --libdir=DIR            object code libraries [EPREFIX/lib]
    --includedir=DIR        C header files [PREFIX/include]
    --oldincludedir=DIR     C header files for non-gcc [/usr/include]
---- xen-4.8.2+xsa243.orig/docs/configure
-+++ xen-4.8.2+xsa243/docs/configure
+--- a/docs/configure
++++ b/docs/configure
 @@ -632,6 +632,7 @@ infodir
  docdir
  oldincludedir
@@ -110,8 +110,8 @@ Signed-off-by: Ian Jackson <ian.jackson@citrix.com>
    --libdir=DIR            object code libraries [EPREFIX/lib]
    --includedir=DIR        C header files [PREFIX/include]
    --oldincludedir=DIR     C header files for non-gcc [/usr/include]
---- xen-4.8.2+xsa243.orig/stubdom/configure
-+++ xen-4.8.2+xsa243/stubdom/configure
+--- a/stubdom/configure
++++ b/stubdom/configure
 @@ -659,6 +659,7 @@ infodir
  docdir
  oldincludedir
@@ -161,8 +161,8 @@ Signed-off-by: Ian Jackson <ian.jackson@citrix.com>
    --libdir=DIR            object code libraries [EPREFIX/lib]
    --includedir=DIR        C header files [PREFIX/include]
    --oldincludedir=DIR     C header files for non-gcc [/usr/include]
---- xen-4.8.2+xsa243.orig/tools/configure
-+++ xen-4.8.2+xsa243/tools/configure
+--- a/tools/configure
++++ b/tools/configure
 @@ -767,6 +767,7 @@ infodir
  docdir
  oldincludedir

diff --git a/debian/patches/tools-blktap2-prefix.diff b/debian/patches/tools-blktap2-prefix.diff
index 9b1ae92c3c10acf135be329b56bf5e10bbdff3ea..fac2e8715966529e5154943e5fcce887c50e5e52 100644 (file)
--- a/debian/patches/tools-blktap2-prefix.diff
+++ b/debian/patches/tools-blktap2-prefix.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-blktap2-prefix.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/blktap2/control/Makefile
-+++ xen-4.8.2+xsa243/tools/blktap2/control/Makefile
+--- a/tools/blktap2/control/Makefile
++++ b/tools/blktap2/control/Makefile
 @@ -1,10 +1,7 @@
  XEN_ROOT := $(CURDIR)/../../../
  include $(XEN_ROOT)/tools/Rules.mk
@@ -67,8 +67,8 @@ Patch-Name: tools-blktap2-prefix.diff
        rm -f *~
  
  distclean: clean
---- xen-4.8.2+xsa243.orig/tools/blktap2/vhd/Makefile
-+++ xen-4.8.2+xsa243/tools/blktap2/vhd/Makefile
+--- a/tools/blktap2/vhd/Makefile
++++ b/tools/blktap2/vhd/Makefile
 @@ -12,6 +12,7 @@ CFLAGS            += -Werror
  CFLAGS            += -Wno-unused
  CFLAGS            += -I../include
@@ -77,8 +77,8 @@ Patch-Name: tools-blktap2-prefix.diff
  
  ifeq ($(CONFIG_X86_64),y)
  CFLAGS            += -fPIC
---- xen-4.8.2+xsa243.orig/tools/blktap2/vhd/lib/Makefile
-+++ xen-4.8.2+xsa243/tools/blktap2/vhd/lib/Makefile
+--- a/tools/blktap2/vhd/lib/Makefile
++++ b/tools/blktap2/vhd/lib/Makefile
 @@ -2,25 +2,19 @@ XEN_ROOT=$(CURDIR)/../../../..
  BLKTAP_ROOT := ../..
  include $(XEN_ROOT)/tools/Rules.mk

diff --git a/debian/patches/tools-console-prefix.diff b/debian/patches/tools-console-prefix.diff
index 7c5024809b054aea3d0c209d2d0cd7190303063f..6736fff4d51134406950fd1837e2be23e16b2083 100644 (file)
--- a/debian/patches/tools-console-prefix.diff
+++ b/debian/patches/tools-console-prefix.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-console-prefix.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/console/Makefile
-+++ xen-4.8.2+xsa243/tools/console/Makefile
+--- a/tools/console/Makefile
++++ b/tools/console/Makefile
 @@ -8,6 +8,7 @@ CFLAGS  += $(CFLAGS_libxenstore)
  LDLIBS += $(LDLIBS_libxenctrl)
  LDLIBS += $(LDLIBS_libxenstore)

diff --git a/debian/patches/tools-include-install.diff b/debian/patches/tools-include-install.diff
index 7f773aa1039ffcfc46eb61c241cb4e542fbb051a..f19c066aa31162b4a227ce58395d7fe5cc480205 100644 (file)
--- a/debian/patches/tools-include-install.diff
+++ b/debian/patches/tools-include-install.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-include-install.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/include/Makefile
-+++ xen-4.8.2+xsa243/tools/include/Makefile
+--- a/tools/include/Makefile
++++ b/tools/include/Makefile
 @@ -14,7 +14,6 @@ xen-foreign:
  xen/.dir:
        @rm -rf xen

diff --git a/debian/patches/tools-libfsimage-abiname.diff b/debian/patches/tools-libfsimage-abiname.diff
index b26bbfda718a64322a5214fb761b83ae518b60f9..82715e312e15f2c201120472b68a6d597a5a26d1 100644 (file)
--- a/debian/patches/tools-libfsimage-abiname.diff
+++ b/debian/patches/tools-libfsimage-abiname.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-libfsimage-abiname.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/libfsimage/common/Makefile
-+++ xen-4.8.2+xsa243/tools/libfsimage/common/Makefile
+--- a/tools/libfsimage/common/Makefile
++++ b/tools/libfsimage/common/Makefile
 @@ -1,9 +1,6 @@
  XEN_ROOT = $(CURDIR)/../../..
  include $(XEN_ROOT)/tools/libfsimage/Rules.mk

diff --git a/debian/patches/tools-libfsimage-prefix.diff b/debian/patches/tools-libfsimage-prefix.diff
index 9360e97f58dd0593e6b2dfe83b0ff7a8da44d815..ee15d59ac0aa13bc72b1d1ff259b01ff2745fc5d 100644 (file)
--- a/debian/patches/tools-libfsimage-prefix.diff
+++ b/debian/patches/tools-libfsimage-prefix.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-libfsimage-prefix.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/libfsimage/Rules.mk
-+++ xen-4.8.2+xsa243/tools/libfsimage/Rules.mk
+--- a/tools/libfsimage/Rules.mk
++++ b/tools/libfsimage/Rules.mk
 @@ -3,10 +3,11 @@ include $(XEN_ROOT)/tools/Rules.mk
  CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\"
  CFLAGS += -Werror -D_GNU_SOURCE
@@ -21,8 +21,8 @@ Patch-Name: tools-libfsimage-prefix.diff
  
  FSLIB = fsimage.so
  
---- xen-4.8.2+xsa243.orig/tools/libfsimage/common/Makefile
-+++ xen-4.8.2+xsa243/tools/libfsimage/common/Makefile
+--- a/tools/libfsimage/common/Makefile
++++ b/tools/libfsimage/common/Makefile
 @@ -1,6 +1,8 @@
  XEN_ROOT = $(CURDIR)/../../..
  include $(XEN_ROOT)/tools/libfsimage/Rules.mk

diff --git a/debian/patches/tools-libxc-abiname.diff b/debian/patches/tools-libxc-abiname.diff
index 5a5299df01a9e3a777de1798e8ae6e502f52f885..5a5a8fa7e11fd46552c87b577c1969de14bdb3a2 100644 (file)
--- a/debian/patches/tools-libxc-abiname.diff
+++ b/debian/patches/tools-libxc-abiname.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-libxc-abiname.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/libxc/Makefile
-+++ xen-4.8.2+xsa243/tools/libxc/Makefile
+--- a/tools/libxc/Makefile
++++ b/tools/libxc/Makefile
 @@ -1,9 +1,6 @@
  XEN_ROOT = $(CURDIR)/../..
  include $(XEN_ROOT)/tools/Rules.mk

diff --git a/debian/patches/tools-libxl-abiname.diff b/debian/patches/tools-libxl-abiname.diff
index ff4289a3b1d8949a6fcdf637f9cc3712f99cbc6f..2aeda4e331f9358fb5bda54d0162e2eb0253aecd 100644 (file)
--- a/debian/patches/tools-libxl-abiname.diff
+++ b/debian/patches/tools-libxl-abiname.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-libxl-abiname.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/libxl/Makefile
-+++ xen-4.8.2+xsa243/tools/libxl/Makefile
+--- a/tools/libxl/Makefile
++++ b/tools/libxl/Makefile
 @@ -5,12 +5,6 @@
  XEN_ROOT = $(CURDIR)/../..
  include $(XEN_ROOT)/tools/Rules.mk

diff --git a/debian/patches/tools-libxl-prefix.diff b/debian/patches/tools-libxl-prefix.diff
index cecdb412a6f9ffe961606eb330c216bd8489ddf6..a9fe9032572e6395e4208ed073cabe2e4d97949d 100644 (file)
--- a/debian/patches/tools-libxl-prefix.diff
+++ b/debian/patches/tools-libxl-prefix.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-libxl-prefix.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/libxl/Makefile
-+++ xen-4.8.2+xsa243/tools/libxl/Makefile
+--- a/tools/libxl/Makefile
++++ b/tools/libxl/Makefile
 @@ -12,6 +12,8 @@ CFLAGS += -I. -fPIC
  ifeq ($(CONFIG_Linux),y)
  LIBUUID_LIBS += -luuid

diff --git a/debian/patches/tools-misc-prefix.diff b/debian/patches/tools-misc-prefix.diff
index 33c73ef7fda1f19ce9727651b495280c6682d749..0ae3358f91d7af85715f5b7d14484f1591d3f733 100644 (file)
--- a/debian/patches/tools-misc-prefix.diff
+++ b/debian/patches/tools-misc-prefix.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-misc-prefix.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/misc/Makefile
-+++ xen-4.8.2+xsa243/tools/misc/Makefile
+--- a/tools/misc/Makefile
++++ b/tools/misc/Makefile
 @@ -54,12 +54,8 @@ all build: $(TARGETS_BUILD)
  
  .PHONY: install

diff --git a/debian/patches/tools-pygrub-prefix.diff b/debian/patches/tools-pygrub-prefix.diff
index f630378b4c8ac4889961deff56f8807852699a72..3b05289be6385b3932a950541f9c39d8cc3267c6 100644 (file)
--- a/debian/patches/tools-pygrub-prefix.diff
+++ b/debian/patches/tools-pygrub-prefix.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-pygrub-prefix.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/pygrub/Makefile
-+++ xen-4.8.2+xsa243/tools/pygrub/Makefile
+--- a/tools/pygrub/Makefile
++++ b/tools/pygrub/Makefile
 @@ -16,11 +16,6 @@ install: all
        CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) \
                setup.py install $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)"  \
@@ -20,8 +20,8 @@ Patch-Name: tools-pygrub-prefix.diff
  
  .PHONY: clean
  clean:
---- xen-4.8.2+xsa243.orig/tools/pygrub/setup.py
-+++ xen-4.8.2+xsa243/tools/pygrub/setup.py
+--- a/tools/pygrub/setup.py
++++ b/tools/pygrub/setup.py
 @@ -4,11 +4,13 @@ import os
  import sys
  
@@ -36,8 +36,8 @@ Patch-Name: tools-pygrub-prefix.diff
      include_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
      library_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
      libraries = ["fsimage"],
---- xen-4.8.2+xsa243.orig/tools/pygrub/src/pygrub
-+++ xen-4.8.2+xsa243/tools/pygrub/src/pygrub
+--- a/tools/pygrub/src/pygrub
++++ b/tools/pygrub/src/pygrub
 @@ -21,6 +21,8 @@ import xen.lowlevel.xc
  import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
  import getopt

diff --git a/debian/patches/tools-pygrub-remove-static-solaris-support b/debian/patches/tools-pygrub-remove-static-solaris-support
index cf828f997e0e9b943dc9fece99b7b33341b645dd..23e74a272d025f05c0edf3ae4c02ca4c8b63813d 100644 (file)
--- a/debian/patches/tools-pygrub-remove-static-solaris-support
+++ b/debian/patches/tools-pygrub-remove-static-solaris-support
@@ -6,8 +6,8 @@ Patch-Name: tools-pygrub-remove-static-solaris-support
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/pygrub/src/pygrub
-+++ xen-4.8.2+xsa243/tools/pygrub/src/pygrub
+--- a/tools/pygrub/src/pygrub
++++ b/tools/pygrub/src/pygrub
 @@ -16,7 +16,6 @@ import os, sys, string, struct, tempfile
  import copy
  import logging

diff --git a/debian/patches/tools-python-prefix.diff b/debian/patches/tools-python-prefix.diff
index b5c2bdbf54b1a4ab3e9f34306bc9ff1fc7439d0e..48375b7a50294b97d1b9e55457a8f84995627a24 100644 (file)
--- a/debian/patches/tools-python-prefix.diff
+++ b/debian/patches/tools-python-prefix.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-python-prefix.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/python/setup.py
-+++ xen-4.8.2+xsa243/tools/python/setup.py
+--- a/tools/python/setup.py
++++ b/tools/python/setup.py
 @@ -5,6 +5,7 @@ import os, sys
  XEN_ROOT = "../.."
  

diff --git a/debian/patches/tools-rpath.diff b/debian/patches/tools-rpath.diff
index 868c28daa5e3e4581c0a7aa650371fd48a7524e4..f6ecd2c10872a102cdafcce3ff2ba13582d05278 100644 (file)
--- a/debian/patches/tools-rpath.diff
+++ b/debian/patches/tools-rpath.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-rpath.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/Rules.mk
-+++ xen-4.8.2+xsa243/tools/Rules.mk
+--- a/tools/Rules.mk
++++ b/tools/Rules.mk
 @@ -9,6 +9,8 @@ include $(XEN_ROOT)/Config.mk
  export _INSTALL := $(INSTALL)
  INSTALL = $(XEN_ROOT)/tools/cross-install

diff --git a/debian/patches/tools-xcutils-rpath.diff b/debian/patches/tools-xcutils-rpath.diff
index 77d927e24fc37b266237394afddb6980b3e3441c..6e7db6a40b838b0876cbcb6e1c290a2168aece48 100644 (file)
--- a/debian/patches/tools-xcutils-rpath.diff
+++ b/debian/patches/tools-xcutils-rpath.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-xcutils-rpath.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/xcutils/Makefile
-+++ xen-4.8.2+xsa243/tools/xcutils/Makefile
+--- a/tools/xcutils/Makefile
++++ b/tools/xcutils/Makefile
 @@ -19,6 +19,8 @@ CFLAGS += -Werror
  CFLAGS_readnotes.o  := $(CFLAGS_libxenevtchn) $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) -I$(XEN_ROOT)/tools/libxc $(CFLAGS_libxencall)
  CFLAGS_lsevtchn.o   := $(CFLAGS_libxenevtchn) $(CFLAGS_libxenctrl)

diff --git a/debian/patches/tools-xenmon-install.diff b/debian/patches/tools-xenmon-install.diff
index b0d2fc4113206c7531f6cd2eda9aee85cd85859e..e9120bfd86f28ef05a6909a0a355e5683ea7cb46 100644 (file)
--- a/debian/patches/tools-xenmon-install.diff
+++ b/debian/patches/tools-xenmon-install.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-xenmon-install.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/xenmon/Makefile
-+++ xen-4.8.2+xsa243/tools/xenmon/Makefile
+--- a/tools/xenmon/Makefile
++++ b/tools/xenmon/Makefile
 @@ -13,6 +13,10 @@
  XEN_ROOT=$(CURDIR)/../..
  include $(XEN_ROOT)/tools/Rules.mk

diff --git a/debian/patches/tools-xenmon-prefix.diff b/debian/patches/tools-xenmon-prefix.diff
index aebfc62632273d896a229f44858019a640a21973..6579a72e16fdb1add627de8e1a7670274d363f5e 100644 (file)
--- a/debian/patches/tools-xenmon-prefix.diff
+++ b/debian/patches/tools-xenmon-prefix.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-xenmon-prefix.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/xenmon/Makefile
-+++ xen-4.8.2+xsa243/tools/xenmon/Makefile
+--- a/tools/xenmon/Makefile
++++ b/tools/xenmon/Makefile
 @@ -18,6 +18,7 @@ CFLAGS  += $(CFLAGS_libxenevtchn)
  CFLAGS  += $(CFLAGS_libxenctrl)
  LDLIBS  += $(LDLIBS_libxenctrl)

diff --git a/debian/patches/tools-xenpaging-prefix.diff b/debian/patches/tools-xenpaging-prefix.diff
index 7d42419fc1e1aa3b675f3c323f8b757144022b33..7cdd3ae978d801aabb20fb4899f972daf30c4024 100644 (file)
--- a/debian/patches/tools-xenpaging-prefix.diff
+++ b/debian/patches/tools-xenpaging-prefix.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-xenpaging-prefix.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/xenpaging/Makefile
-+++ xen-4.8.2+xsa243/tools/xenpaging/Makefile
+--- a/tools/xenpaging/Makefile
++++ b/tools/xenpaging/Makefile
 @@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk
  # xenpaging.c and file_ops.c incorrectly use libxc internals
  CFLAGS += $(CFLAGS_libxentoollog) $(CFLAGS_libxenevtchn) $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(PTHREAD_CFLAGS) -I$(XEN_ROOT)/tools/libxc $(CFLAGS_libxencall)

diff --git a/debian/patches/tools-xenpmd-prefix.diff b/debian/patches/tools-xenpmd-prefix.diff
index eb32108507c86e47d68141e896b0ce9dbb0b9ef3..62219358efabebcd4b42b6c3a3fc861be9c588a8 100644 (file)
--- a/debian/patches/tools-xenpmd-prefix.diff
+++ b/debian/patches/tools-xenpmd-prefix.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-xenpmd-prefix.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/xenpmd/Makefile
-+++ xen-4.8.2+xsa243/tools/xenpmd/Makefile
+--- a/tools/xenpmd/Makefile
++++ b/tools/xenpmd/Makefile
 @@ -11,8 +11,8 @@ all: xenpmd
  
  .PHONY: install

diff --git a/debian/patches/tools-xenstat-abiname.diff b/debian/patches/tools-xenstat-abiname.diff
index c19bde434c0422c5d79cfe6ba8c8d99ba7f34a75..6b46a1f8f8fd046c907d4d4c1d587cf2e951d7b2 100644 (file)
--- a/debian/patches/tools-xenstat-abiname.diff
+++ b/debian/patches/tools-xenstat-abiname.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-xenstat-abiname.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/xenstat/libxenstat/Makefile
-+++ xen-4.8.2+xsa243/tools/xenstat/libxenstat/Makefile
+--- a/tools/xenstat/libxenstat/Makefile
++++ b/tools/xenstat/libxenstat/Makefile
 @@ -18,18 +18,14 @@ include $(XEN_ROOT)/tools/Rules.mk
  LDCONFIG=ldconfig
  MAKE_LINK=ln -sf

diff --git a/debian/patches/tools-xenstat-prefix.diff b/debian/patches/tools-xenstat-prefix.diff
index 5921262c0fbb08c1fa2076db9e2633f5e830b476..f1e2478ca14d5b78c25c269ad6d5eb8b4a3a56a5 100644 (file)
--- a/debian/patches/tools-xenstat-prefix.diff
+++ b/debian/patches/tools-xenstat-prefix.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-xenstat-prefix.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/xenstat/libxenstat/Makefile
-+++ xen-4.8.2+xsa243/tools/xenstat/libxenstat/Makefile
+--- a/tools/xenstat/libxenstat/Makefile
++++ b/tools/xenstat/libxenstat/Makefile
 @@ -20,7 +20,7 @@ MAKE_LINK=ln -sf
  
  LIB=src/libxenstat.a
@@ -30,8 +30,8 @@ Patch-Name: tools-xenstat-prefix.diff
  
  PYLIB=bindings/swig/python/_xenstat.so
  PYMOD=bindings/swig/python/xenstat.py
---- xen-4.8.2+xsa243.orig/tools/xenstat/xentop/Makefile
-+++ xen-4.8.2+xsa243/tools/xenstat/xentop/Makefile
+--- a/tools/xenstat/xentop/Makefile
++++ b/tools/xenstat/xentop/Makefile
 @@ -19,7 +19,9 @@ all install xentop:
  else
  

diff --git a/debian/patches/tools-xenstore-compatibility.diff b/debian/patches/tools-xenstore-compatibility.diff
index 4c4df8bb07df361989bdac5cde648f806cf11103..06ef66ec6b83ed0303e9fd9c33866b458067ad98 100644 (file)
--- a/debian/patches/tools-xenstore-compatibility.diff
+++ b/debian/patches/tools-xenstore-compatibility.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-xenstore-compatibility.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/xenstore/include/xenstore.h
-+++ xen-4.8.2+xsa243/tools/xenstore/include/xenstore.h
+--- a/tools/xenstore/include/xenstore.h
++++ b/tools/xenstore/include/xenstore.h
 @@ -25,6 +25,7 @@
  
  #define XS_OPEN_READONLY      1UL<<0
@@ -16,8 +16,8 @@ Patch-Name: tools-xenstore-compatibility.diff
  
  /*
   * Setting XS_UNWATCH_FILTER arranges that after xs_unwatch, no
---- xen-4.8.2+xsa243.orig/tools/xenstore/xenstore_client.c
-+++ xen-4.8.2+xsa243/tools/xenstore/xenstore_client.c
+--- a/tools/xenstore/xenstore_client.c
++++ b/tools/xenstore/xenstore_client.c
 @@ -636,7 +636,7 @@ main(int argc, char **argv)
            max_width = ws.ws_col - 2;
      }
@@ -27,8 +27,8 @@ Patch-Name: tools-xenstore-compatibility.diff
      if (xsh == NULL) err(1, "xs_open");
  
  again:
---- xen-4.8.2+xsa243.orig/tools/xenstore/xs.c
-+++ xen-4.8.2+xsa243/tools/xenstore/xs.c
+--- a/tools/xenstore/xs.c
++++ b/tools/xenstore/xs.c
 @@ -281,17 +281,19 @@ struct xs_handle *xs_daemon_open_readonl
  
  struct xs_handle *xs_domain_open(void)

diff --git a/debian/patches/tools-xenstore-prefix.diff b/debian/patches/tools-xenstore-prefix.diff
index 18d6fbf4245a25edb9a5a3e98ae9185792fed190..977c2f2576b20d2caa3088bb9904cc99d1c9a1de 100644 (file)
--- a/debian/patches/tools-xenstore-prefix.diff
+++ b/debian/patches/tools-xenstore-prefix.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-xenstore-prefix.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/helpers/Makefile
-+++ xen-4.8.2+xsa243/tools/helpers/Makefile
+--- a/tools/helpers/Makefile
++++ b/tools/helpers/Makefile
 @@ -31,7 +31,7 @@ xen-init-dom0: $(XEN_INIT_DOM0_OBJS)
  $(INIT_XENSTORE_DOMAIN_OBJS): _paths.h
  
@@ -17,8 +17,8 @@ Patch-Name: tools-xenstore-prefix.diff
  
  .PHONY: install
  install: all
---- xen-4.8.2+xsa243.orig/tools/xenstore/Makefile
-+++ xen-4.8.2+xsa243/tools/xenstore/Makefile
+--- a/tools/xenstore/Makefile
++++ b/tools/xenstore/Makefile
 @@ -20,6 +20,8 @@ LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_L
  CFLAGS  += $(CFLAGS-y)
  LDFLAGS += $(LDFLAGS-y)

diff --git a/debian/patches/tools-xentrace-prefix.diff b/debian/patches/tools-xentrace-prefix.diff
index 0148121545aa92e7dd6da9bbed0e9ec2f877a7da..fc8261776e128d7c0ed55174766f94a5bdb7bb90 100644 (file)
--- a/debian/patches/tools-xentrace-prefix.diff
+++ b/debian/patches/tools-xentrace-prefix.diff
@@ -6,8 +6,8 @@ Patch-Name: tools-xentrace-prefix.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/xentrace/Makefile
-+++ xen-4.8.2+xsa243/tools/xentrace/Makefile
+--- a/tools/xentrace/Makefile
++++ b/tools/xentrace/Makefile
 @@ -8,6 +8,7 @@ CFLAGS += $(CFLAGS_libxenctrl)
  LDLIBS += $(LDLIBS_libxenevtchn)
  LDLIBS += $(LDLIBS_libxenctrl)

diff --git a/debian/patches/toolstestsx86_emulator-pass--no-pie--fno.patch b/debian/patches/toolstestsx86_emulator-pass--no-pie--fno.patch
index 7d62509d302175f4e86b5b760444cd075f0db005..d1e2bae5bcff1adf32dfe99b6e42b8aa5b9b1d3c 100644 (file)
--- a/debian/patches/toolstestsx86_emulator-pass--no-pie--fno.patch
+++ b/debian/patches/toolstestsx86_emulator-pass--no-pie--fno.patch
@@ -32,8 +32,8 @@ Signed-off-by: Ian Jackson <ian.jackson@citrix.com>
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/tests/x86_emulator/Makefile
-+++ xen-4.8.2+xsa243/tools/tests/x86_emulator/Makefile
+--- a/tools/tests/x86_emulator/Makefile
++++ b/tools/tests/x86_emulator/Makefile
 @@ -45,6 +45,10 @@ x86_emulate/x86_emulate.c x86_emulate/x8
  
  HOSTCFLAGS += $(CFLAGS_xeninclude)

diff --git a/debian/patches/ubuntu-tools-libs-abiname.diff b/debian/patches/ubuntu-tools-libs-abiname.diff
index de8bd3cf7317d2da1f227878aca92ab3324f8b3f..6094f1ee178e385a4966def1edcb6117101a9166 100644 (file)
--- a/debian/patches/ubuntu-tools-libs-abiname.diff
+++ b/debian/patches/ubuntu-tools-libs-abiname.diff
@@ -5,8 +5,8 @@ Subject: ubuntu-tools-libs-abiname
 
 ---
 
---- xen-4.8.2+xsa243.orig/tools/libs/call/Makefile
-+++ xen-4.8.2+xsa243/tools/libs/call/Makefile
+--- a/tools/libs/call/Makefile
++++ b/tools/libs/call/Makefile
 @@ -39,22 +39,22 @@ headers.chk: $(wildcard include/*.h)
  libxencall.a: $(LIB_OBJS)
        $(AR) rc $@ $^
@@ -46,8 +46,8 @@ Subject: ubuntu-tools-libs-abiname
        rm -f headers.chk
  
  .PHONY: distclean
---- xen-4.8.2+xsa243.orig/tools/libs/evtchn/Makefile
-+++ xen-4.8.2+xsa243/tools/libs/evtchn/Makefile
+--- a/tools/libs/evtchn/Makefile
++++ b/tools/libs/evtchn/Makefile
 @@ -39,22 +39,22 @@ headers.chk: $(wildcard include/*.h)
  libxenevtchn.a: $(LIB_OBJS)
        $(AR) rc $@ $^
@@ -87,8 +87,8 @@ Subject: ubuntu-tools-libs-abiname
        rm -f headers.chk
  
  .PHONY: distclean
---- xen-4.8.2+xsa243.orig/tools/libs/foreignmemory/Makefile
-+++ xen-4.8.2+xsa243/tools/libs/foreignmemory/Makefile
+--- a/tools/libs/foreignmemory/Makefile
++++ b/tools/libs/foreignmemory/Makefile
 @@ -39,22 +39,22 @@ headers.chk: $(wildcard include/*.h)
  libxenforeignmemory.a: $(LIB_OBJS)
        $(AR) rc $@ $^
@@ -128,8 +128,8 @@ Subject: ubuntu-tools-libs-abiname
        rm -f headers.chk
  
  .PHONY: distclean
---- xen-4.8.2+xsa243.orig/tools/libs/gnttab/Makefile
-+++ xen-4.8.2+xsa243/tools/libs/gnttab/Makefile
+--- a/tools/libs/gnttab/Makefile
++++ b/tools/libs/gnttab/Makefile
 @@ -41,22 +41,22 @@ headers.chk: $(wildcard include/*.h)
  libxengnttab.a: $(LIB_OBJS)
        $(AR) rc $@ $^
@@ -169,8 +169,8 @@ Subject: ubuntu-tools-libs-abiname
        rm -f headers.chk
  
  .PHONY: distclean
---- xen-4.8.2+xsa243.orig/tools/libs/toollog/Makefile
-+++ xen-4.8.2+xsa243/tools/libs/toollog/Makefile
+--- a/tools/libs/toollog/Makefile
++++ b/tools/libs/toollog/Makefile
 @@ -34,22 +34,22 @@ headers.chk: $(wildcard include/*.h)
  libxentoollog.a: $(LIB_OBJS)
        $(AR) rc $@ $^

diff --git a/debian/patches/version.diff b/debian/patches/version.diff
index f6029ddd89012181759bdb805ca952e67f38c5e9..7295d9def13cd7a4d5c06cde5556a7356025f0ad 100644 (file)
--- a/debian/patches/version.diff
+++ b/debian/patches/version.diff
@@ -6,8 +6,8 @@ Patch-Name: version.diff
 
 ---
 
---- xen-4.8.2+xsa243.orig/xen/Makefile
-+++ xen-4.8.2+xsa243/xen/Makefile
+--- a/xen/Makefile
++++ b/xen/Makefile
 @@ -160,7 +160,7 @@ delete-unfresh-files:
        @mv -f $@.tmp $@
  
@@ -31,8 +31,8 @@ Patch-Name: version.diff
        @mv -f $@.new $@
  
  include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
---- xen-4.8.2+xsa243.orig/xen/common/kernel.c
-+++ xen-4.8.2+xsa243/xen/common/kernel.c
+--- a/xen/common/kernel.c
++++ b/xen/common/kernel.c
 @@ -252,8 +252,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL
  
          memset(&info, 0, sizeof(info));
@@ -44,8 +44,8 @@ Patch-Name: version.diff
          safe_strcpy(info.compile_date,   deny ? xen_deny() : xen_compile_date());
          if ( copy_to_guest(arg, &info, 1) )
              return -EFAULT;
---- xen-4.8.2+xsa243.orig/xen/common/version.c
-+++ xen-4.8.2+xsa243/xen/common/version.c
+--- a/xen/common/version.c
++++ b/xen/common/version.c
 @@ -20,19 +20,24 @@ const char *xen_compile_time(void)
      return XEN_COMPILE_TIME;
  }
@@ -89,8 +89,8 @@ Patch-Name: version.diff
  const char *xen_deny(void)
  {
      return "<denied>";
---- xen-4.8.2+xsa243.orig/xen/drivers/char/console.c
-+++ xen-4.8.2+xsa243/xen/drivers/char/console.c
+--- a/xen/drivers/char/console.c
++++ b/xen/drivers/char/console.c
 @@ -732,14 +732,11 @@ void __init console_init_preirq(void)
      serial_set_rx_handler(sercon_handle, serial_rx);
  
@@ -109,8 +109,8 @@ Patch-Name: version.diff
  
      if ( opt_sync_console )
      {
---- xen-4.8.2+xsa243.orig/xen/include/xen/compile.h.in
-+++ xen-4.8.2+xsa243/xen/include/xen/compile.h.in
+--- a/xen/include/xen/compile.h.in
++++ b/xen/include/xen/compile.h.in
 @@ -1,8 +1,9 @@
  #define XEN_COMPILE_DATE      "@@date@@"
  #define XEN_COMPILE_TIME      "@@time@@"
@@ -129,8 +129,8 @@ Patch-Name: version.diff
  
  #define XEN_CHANGESET         "@@changeset@@"
 -#define XEN_BANNER            \
---- xen-4.8.2+xsa243.orig/xen/include/xen/version.h
-+++ xen-4.8.2+xsa243/xen/include/xen/version.h
+--- a/xen/include/xen/version.h
++++ b/xen/include/xen/version.h
 @@ -6,9 +6,10 @@
  
  const char *xen_compile_date(void);